arm: Leave smccc calls in .text when efi_loader=n

Commit 81ea00838c6 ("efi_loader: PSCI reset and shutdown") put the SMCCC
assembly code into the efi specific code section. This is wrong when we
do not have EFI_LOADER enabled, as that strips efi runtime sections from
the output binary

Reported-by: Michal Simek <[email protected]>
Reported-by: Siva Durga Prasad Paladugu <[email protected]>
Tested-by: Michal Simek <[email protected]>
Fixes: 81ea00838c6 ("efi_loader: PSCI reset and shutdown")
Signed-off-by: Alexander Graf <[email protected]>

diff --git a/arch/arm/cpu/armv7/smccc-call.S b/arch/arm/cpu/armv7/smccc-call.S
index eae69e36c3c711532d6708ef090fc9353a801f3a..f70728f2c4af21bc61d1ba761cf0e4d4a1a87f0e 100644 (file)
--- a/arch/arm/cpu/armv7/smccc-call.S
+++ b/arch/arm/cpu/armv7/smccc-call.S
@@ -7,7 +7,9 @@
 #include <asm/opcodes-sec.h>
 #include <asm/opcodes-virt.h>
 
+#ifdef CONFIG_EFI_LOADER
        .section        .text.efi_runtime
+#endif
 
 #define UNWIND(x...)
        /*

diff --git a/arch/arm/cpu/armv8/smccc-call.S b/arch/arm/cpu/armv8/smccc-call.S
index 86de4b4089d6ce1082c35bf8904158b4224d9498..dc92b28777c3907aca84edfc00b862dbf7aa0380 100644 (file)
--- a/arch/arm/cpu/armv8/smccc-call.S
+++ b/arch/arm/cpu/armv8/smccc-call.S
@@ -6,7 +6,9 @@
 #include <linux/arm-smccc.h>
 #include <generated/asm-offsets.h>
 
+#ifdef CONFIG_EFI_LOADER
        .section        .text.efi_runtime
+#endif
 
        .macro SMCCC instr
        .cfi_startproc